Bug 571576 – gdk_pixbuf_save_to_stream() broken

2009-02-12  Cody Russell  <bratsche@gnome.org>

        Bug 571576 – gdk_pixbuf_save_to_stream() broken

        * gdk-pixbuf/gdk-pixbuf-io.c: Fix gdk_pixbuf_save_to_stream() so that
        it does not always return FALSE (even when it succeeds), and also so
        that it does not set error to NULL when something goes wrong.

svn path=/trunk/; revision=22322

diff --git a/ChangeLog b/ChangeLog
index 77a3dea8595935f5a2f3ff2daffd67c74e184e34..c72ecf02195ec93ad333139a5d7b2b4a5ce5b368 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-02-12  Cody Russell  <bratsche@gnome.org>
+
+       Bug 571576 – gdk_pixbuf_save_to_stream() broken
+
+       * gdk-pixbuf/gdk-pixbuf-io.c: Fix gdk_pixbuf_save_to_stream() so that
+       it does not always return FALSE (even when it succeeds), and also so
+       that it does not set error to NULL when something goes wrong.
+
 2009-02-12  Marek Kasik  <mkasik@redhat.com>
 
        Bug 568571 – Asian am/pm format on cups print backend's time parsing

diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index 641e7475130797c0245101f10d130874b8c383a0..b1b9be24bdc76ff279dde82771ad8ad7a4c6276f 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -2406,13 +2406,10 @@ gdk_pixbuf_save_to_stream (GdkPixbuf      *pixbuf,
        data.stream = stream;
        data.cancellable = cancellable;
 
-       if (!gdk_pixbuf_save_to_callbackv (pixbuf, save_to_stream, 
-                                          &data, type, 
-                                          keys, values, 
-                                          error)) {
-               error = NULL; /* Ignore further errors */
-               res = FALSE;
-       }
+       res = gdk_pixbuf_save_to_callbackv (pixbuf, save_to_stream, 
+                                           &data, type, 
+                                           keys, values, 
+                                           error);
 
        g_strfreev (keys);
        g_strfreev (values);